small changes
Ready to implement the main features