fixed minor perifpheral stuff, uploaded
merged versions