basic changes implemented, debugging